From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 6 Apr 2012 18:02:23 +0000 (-0400)
Subject: extensionUtils: Load user extensions before system extensions
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6688
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5ea5806730b311c341436266670c1091e994ff58;p=gnome-shell.git

extensionUtils: Load user extensions before system extensions

https://bugzilla.gnome.org/show_bug.cgi?id=673613
---

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 1697c4609..7dcf166de 100644
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -184,11 +184,11 @@ function scanExtensionsInDirectory(callback, dir, type) {
 
 function scanExtensions(callback) {
     let systemDataDirs = GLib.get_system_data_dirs();
+    scanExtensionsInDirectory(callback, userExtensionsDir, ExtensionType.PER_USER);
     for (let i = 0; i < systemDataDirs.length; i++) {
         let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
         let dir = Gio.file_new_for_path(dirPath);
         if (dir.query_exists(null))
             scanExtensionsInDirectory(callback, dir, ExtensionType.SYSTEM);
     }
-    scanExtensionsInDirectory(callback, userExtensionsDir, ExtensionType.PER_USER);
 }